Weapon familiarities for professions#69007
Merged
Maleclypse merged 6 commits intoCleverRaven:masterfrom Nov 11, 2023
Merged
Conversation
github-actions
bot
added
[JSON]
github-actions
bot
requested review from
John-Candlebury,
KorGgenT and
Maleclypse
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Auto-requesting reviews from non-collaborators: @Hymore246 @GuardianDll @Light-Wave
TheShadowFerret
approved these changes
Nov 2, 2023
Contributor
|
@Maleclypse will probably want this rebased before merge like mine 👀 |
Contributor
Author
Oh, it was merged at last! I will rebase this in a flash, give me a moment. |
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
Termineitor244
force-pushed
the
Professions-weapons-familiar
branch
from
4725d95 to
bf60bcf
Compare
github-actions
bot
added
the
BasicBuildPassed
Maleclypse
pushed a commit
to Maleclypse/Cataclysm-DDA
that referenced
this pull request
Nov 16, 2023
* Weapon familiarities for professions * Modded professions * Apply suggestions from code review Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Shivs for criminals * fix --------- Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Content "Adds weapon proficiencies to professions when adequate,"
Purpose of change
#68734 is adding new weapon proficiencies for most weapon categories in the game, the only problem is that professions and hobbies do not grant them yet!
#68990 is already making the hobbies, so why not help with the professions?
Closes #69215 (if the hobbies PR doesn't closes it first).
Describe the solution
Adds proficiencies when appropriate to the professions, the hunters receive basic knife familiarity because they are hunters, they now also have survival skills so they are hunters in more than just name... Food related professions also receive a basic familiarity with knifes, soldiers receive basic familiarity with knifes/rifles/pistols when appropriate, and more for the rest of professions.
Describe alternatives you've considered
None.
Testing
None yet, the PR in question has not been merged yet.
Additional context
Added the proficiencies to the modded professions! Any input on those is more than welcome since I'm not so confident in those.
Requires #68734